Merge https://github.com/velero-io/velero:v1.18.3-rc.1 (6e8f61c) into oadp-1.6 - #551

* Replace github.com/robfig/cron/v3 by github.com/netresearch/go-cron

Replace k8s.io/utils/pointer with k8s.io/utils/ptr

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>

* Replace gopkg.in/yaml.v3 by go.yaml.in/yaml/v3

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>

* Replace github.com/joho/godotenv.

Move the needed code into Velero repository.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>

* Replace github.com/pkg/errors by github.com/cockroachdb/errors

Change errors.Cause to errors.Is, because github.com/cockroachdb/errors
New() function create a error with error stack with depth 1, but
github.com/pkg/errors's New() function create error with no depth.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>

---------

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
Signed-off-by: Xun Jiang/Bruce Jiang <59276555+blackpiglet@users.noreply.github.com>

* Fix PodVolumeBackup metadata loss on fs-backup timeout

When a backup hits the fs-backup timeout, WaitAllPodVolumesProcessed
returned nil because PVBs were only collected from the indexer in the
done branch of the select. This discarded all PVB metadata including
already-completed PVBs, making their data unrestorable.

Move the PVB collection loop to run after the select so tracked PVBs
are always persisted regardless of timeout.

Fixes velero-io#9986

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

* Add changelog for PR velero-io#9995

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

* Filter non-completed PVBs in hasPodVolumeBackup

After preserving tracked PVBs on timeout, non-completed PVBs (in-progress
or with no snapshot ID) would cause hasPodVolumeBackup to return true,
leading the restore to skip the original PV and dynamically re-provision
it without any data to restore from.

Only match PVBs that are Completed with a valid SnapshotID.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

* Add unit tests for hasPodVolumeBackup phase filtering

Verify that hasPodVolumeBackup only matches PVBs that are Completed
with a valid SnapshotID, and rejects in-progress, failed, or
empty-snapshot PVBs.

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>

---------

Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
(cherry picked from commit e593ba7)

…l format

Upstream velero switched golangci-lint installation from the curl-based
installer to `go install` in the v1.18.2-rc.2 cycle. The version
extraction regex in Makefile.prow only matched the old curl pattern,
causing an empty version string and a checksum verification failure in CI.

Update the extraction to handle both the old `curl | sh` format and the
new `go install ... @vX.Y.Z` format. For v2+, use `go install` directly;
for v1.x, fall back to the curl installer.

Closes openshift#519

Signed-off-by: Joseph Vaikath <jvaikath@redhat.com>
Signed-off-by: Joseph <jvaikath@redhat.com>

The pr-changelog-check workflow is an upstream velero-io/velero
workflow. Add the same repository guard that oadp-dev carries so
the job is skipped on openshift/velero PRs targeting oadp-1.6.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

push-builder.yml only runs on velero-io/velero main, so builder
images are never published for release branches. Any PR to oadp-1.6
(or velero release-1.18) that has a Dockerfile change in history
will fail to pull the image. Gate the check to the only context
where the builder image is guaranteed to exist.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>